Skip to content

drm/vc4: hdmi: Remove duplicate hotplug helper call#7489

Open
popcornmix wants to merge 1 commit into
raspberrypi:rpi-6.18.yfrom
popcornmix:double_hotplug
Open

drm/vc4: hdmi: Remove duplicate hotplug helper call#7489
popcornmix wants to merge 1 commit into
raspberrypi:rpi-6.18.yfrom
popcornmix:double_hotplug

Conversation

@popcornmix

Copy link
Copy Markdown
Collaborator

vc4_hdmi_handle_hotplug() calls drm_atomic_helper_connector_hdmi_hotplug() twice: once from the downstream commit 7a761a6 ("vc4: Add jack detection to HDMI audio driver") and once from the upstream code it was rebased onto, which gained the same call in commit 34f051a ("drm/vc4: hdmi: Call HDMI hotplug helper on disconnect").

The helper reads the EDID over DDC, so every detect currently performs two full EDID reads and signals the audio jack state twice. Drop the duplicate and keep the call where upstream has it, after the locking comment.

Fixes: 7a761a6 ("vc4: Add jack detection to HDMI audio driver")

vc4_hdmi_handle_hotplug() calls drm_atomic_helper_connector_hdmi_hotplug()
twice: once from the downstream commit 7a761a6 ("vc4: Add jack
detection to HDMI audio driver") and once from the upstream code it was
rebased onto, which gained the same call in commit 34f051a
("drm/vc4: hdmi: Call HDMI hotplug helper on disconnect").

The helper reads the EDID over DDC, so every detect currently performs
two full EDID reads and signals the audio jack state twice. Drop the
duplicate and keep the call where upstream has it, after the locking
comment.

Fixes: 7a761a6 ("vc4: Add jack detection to HDMI audio driver")
Signed-off-by: Dom Cobley <popcornmix@gmail.com>

@6by9 6by9 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sensible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants